Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 2 Feb 2010 23:25:16 +0000 (23:25 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 2 Feb 2010 23:25:16 +0000 (23:25 +0000)

Trivial merge